Google Git
Sign in
chromium / external / gitster / git-htmldocs / ccc2f7606414a57fc7f34d2f88f8fb2246918d6d / . / git-checkout.html
blob: 22230f0cc42b0f7c77a4eeb5a502400a567c1596 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-checkout(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-checkout(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-checkout -
Junio C Hamanoa14a4032008-03-25 09:11:02[diff] [blame]317 Checkout a branch or paths to the working tree
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamano2b135272006-03-18 07:45:42[diff] [blame]323<div class="verseblock">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]324<div class="content"><em>git checkout</em> [-q] [-f] [[--track | --no-track] -b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]
325<em>git checkout</em> [&lt;tree-ish&gt;] &lt;paths&gt;&#8230;</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]326</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]327<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]328<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]329<div class="para"><p>When &lt;paths&gt; are not given, this command switches branches by
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]330updating the index and working tree to reflect the specified
331branch, &lt;branch&gt;, and updating HEAD to be &lt;branch&gt; or, if
Junio C Hamano2b135272006-03-18 07:45:42[diff] [blame]332specified, &lt;new_branch&gt;. Using -b will cause &lt;new_branch&gt; to
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]333be created; in this case you can use the --track or --no-track
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]334options, which will be passed to <tt>git branch</tt>.</p></div>
335<div class="para"><p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]336branches. It updates the named paths in the working tree from
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]337the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]338from a named commit. In
339this case, the <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving
Junio C Hamano8f62db92007-02-01 00:22:22[diff] [blame]340either of them results in an error. &lt;tree-ish&gt; argument can be
341used to specify a specific tree-ish (i.e. commit, tag or tree)
342to update the index for the given paths before updating the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]343working tree.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]344</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]345<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]346<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]347<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]348<dt>
Junio C Hamano39381a72007-02-02 07:35:15[diff] [blame]349-q
350</dt>
351<dd>
352<p>
Junio C Hamanocae86272007-08-21 02:20:49[diff] [blame]353 Quiet, suppress feedback messages.
Junio C Hamano39381a72007-02-02 07:35:15[diff] [blame]354</p>
355</dd>
356<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]357-f
358</dt>
359<dd>
360<p>
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]361 Proceed even if the index or the working tree differs
362 from HEAD. This is used to throw away local changes.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]363</p>
364</dd>
365<dt>
366-b
367</dt>
368<dd>
369<p>
Junio C Hamanob2f5edd2006-05-21 10:50:09[diff] [blame]370 Create a new branch named &lt;new_branch&gt; and start it at
371 &lt;branch&gt;. The new branch name must pass all checks defined
372 by <a href="git-check-ref-format.html">git-check-ref-format(1)</a>. Some of these checks
373 may restrict the characters allowed in a branch name.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]374</p>
375</dd>
376<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]377-t
378</dt>
379<dt>
380--track
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]381</dt>
382<dd>
383<p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]384 When creating a new branch, set up configuration so that <em>git-pull</em>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]385 will automatically retrieve data from the start point, which must be
386 a branch. Use this if you always pull from the same upstream branch
387 into the new branch, and if you don't want to use "git pull
388 &lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default
389 when the start point is a remote branch. Set the
390 branch.autosetupmerge configuration variable to <tt>false</tt> if you want
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]391 <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]392 given. Set it to <tt>always</tt> if you want this behavior when the
393 start-point is either a local or remote branch.
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]394</p>
395</dd>
396<dt>
397--no-track
398</dt>
399<dd>
400<p>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]401 Ignore the branch.autosetupmerge configuration variable.
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]402</p>
403</dd>
404<dt>
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]405-l
406</dt>
407<dd>
408<p>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]409 Create the new branch's reflog. This activates recording of
410 all changes made to the branch ref, enabling use of date
411 based sha1 expressions such as "&lt;branchname&gt;@{yesterday}".
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]412</p>
413</dd>
414<dt>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]415-m
416</dt>
417<dd>
418<p>
Junio C Hamano2b135272006-03-18 07:45:42[diff] [blame]419 If you have local modifications to one or more files that
420 are different between the current branch and the branch to
421 which you are switching, the command refuses to switch
422 branches in order to preserve your modifications in context.
423 However, with this option, a three-way merge between the current
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]424 branch, your working tree contents, and the new branch
425 is done, and you will be on the new branch.
426</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]427<div class="para"><p>When a merge conflict happens, the index entries for conflicting
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]428paths are left unmerged, and you need to resolve the conflicts
Junio C Hamano89d4e0f2007-02-18 00:34:59[diff] [blame]429and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]430should result in deletion of the path).</p></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]431</dd>
432<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]433&lt;new_branch&gt;
434</dt>
435<dd>
436<p>
437 Name for the new branch.
438</p>
439</dd>
440<dt>
441&lt;branch&gt;
442</dt>
443<dd>
444<p>
445 Branch to checkout; may be any object ID that resolves to a
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]446 commit. Defaults to HEAD.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]447</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]448<div class="para"><p>When this parameter names a non-branch (but still a valid commit object),
449your HEAD becomes <em>detached</em>.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]450</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]451</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]452</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]453<h2 id="_detached_head">Detached HEAD</h2>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]454<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]455<div class="para"><p>It is sometimes useful to be able to <em>checkout</em> a commit that is
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]456not at the tip of one of your branches. The most obvious
457example is to check out the commit at a tagged official release
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]458point, like this:</p></div>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]459<div class="listingblock">
460<div class="content">
461<pre><tt>$ git checkout v2.6.18</tt></pre>
462</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]463<div class="para"><p>Earlier versions of git did not allow this and asked you to
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]464create a temporary branch using <tt>-b</tt> option, but starting from
465version 1.5.0, the above command <em>detaches</em> your HEAD from the
466current branch and directly point at the commit named by the tag
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]467(<tt>v2.6.18</tt> in the above example).</p></div>
468<div class="para"><p>You can use usual git commands while in this state. You can use
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]469<tt>git reset --hard $othercommit</tt> to further move around, for
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]470example. You can make changes and create a new commit on top of
471a detached HEAD. You can even create a merge by using <tt>git
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]472merge $othercommit</tt>.</p></div>
473<div class="para"><p>The state you are in while your HEAD is detached is not recorded
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]474by any branch (which is natural --- you are not on any branch).
475What this means is that you can discard your temporary commits
476and merges by switching back to an existing branch (e.g. <tt>git
477checkout master</tt>), and a later <tt>git prune</tt> or <tt>git gc</tt> would
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]478garbage-collect them. If you did this by mistake, you can ask
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]479the reflog for HEAD where you were, e.g.</p></div>
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]480<div class="listingblock">
481<div class="content">
482<pre><tt>$ git log -g -2 HEAD</tt></pre>
483</div></div>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]484</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]485<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]486<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]487<div class="olist"><ol>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]488<li>
489<p>
490The following sequence checks out the <tt>master</tt> branch, reverts
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]491the <tt>Makefile</tt> to two revisions back, deletes hello.c by
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]492mistake, and gets it back from the index.
493</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]494<div class="listingblock">
495<div class="content">
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]496<pre><tt>$ git checkout master <b>(1)</b>
497$ git checkout master~2 Makefile <b>(2)</b>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]498$ rm -f hello.c
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]499$ git checkout hello.c <b>(3)</b></tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]500</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]501<div class="colist"><ol>
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]502<li>
503<p>
504switch branch
505</p>
506</li>
507<li>
508<p>
509take out a file out of other commit
510</p>
511</li>
512<li>
513<p>
514restore hello.c from HEAD of current branch
515</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]516<div class="para"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]517step would be confused as an instruction to switch to that branch.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]518You should instead write:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]519<div class="listingblock">
520<div class="content">
521<pre><tt>$ git checkout -- hello.c</tt></pre>
522</div></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]523</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]524</ol></div>
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]525</li>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]526<li>
527<p>
528After working in a wrong branch, switching to the correct
Junio C Hamano2b135272006-03-18 07:45:42[diff] [blame]529branch would be done using:
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]530</p>
531<div class="listingblock">
532<div class="content">
533<pre><tt>$ git checkout mytopic</tt></pre>
534</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]535<div class="para"><p>However, your "wrong" branch and correct "mytopic" branch may
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]536differ in files that you have locally modified, in which case,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]537the above checkout would fail like this:</p></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]538<div class="listingblock">
539<div class="content">
540<pre><tt>$ git checkout mytopic
541fatal: Entry 'frotz' not uptodate. Cannot merge.</tt></pre>
542</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]543<div class="para"><p>You can give the <tt>-m</tt> flag to the command, which would try a
544three-way merge:</p></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]545<div class="listingblock">
546<div class="content">
547<pre><tt>$ git checkout -m mytopic
548Auto-merging frotz</tt></pre>
549</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]550<div class="para"><p>After this three-way merge, the local modifications are <em>not</em>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]551registered in your index file, so <tt>git diff</tt> would show you what
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]552changes you made since the tip of the new branch.</p></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]553</li>
554<li>
555<p>
556When a merge conflict happens during switching branches with
557the <tt>-m</tt> option, you would see something like this:
558</p>
559<div class="listingblock">
560<div class="content">
561<pre><tt>$ git checkout -m mytopic
562Auto-merging frotz
563merge: warning: conflicts during merge
564ERROR: Merge conflict in frotz
565fatal: merge program failed</tt></pre>
566</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]567<div class="para"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]568the previous example, as well as the changes in the conflicted
569files. Edit and resolve the conflict and mark it resolved with
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]570<tt>git add</tt> as usual:</p></div>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]571<div class="listingblock">
572<div class="content">
573<pre><tt>$ edit frotz
Junio C Hamano89d4e0f2007-02-18 00:34:59[diff] [blame]574$ git add frotz</tt></pre>
Junio C Hamano74e8a2d2006-01-14 03:58:41[diff] [blame]575</div></div>
576</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]577</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]578</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]579<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]580<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]581<div class="para"><p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]582</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]583<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]585<div class="para"><p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]586</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]587<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]588<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]589<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]590</div>
591<div id="footer">
592<div id="footer-text">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]593Last updated 2008-07-06 05:16:37 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]594</div>
595</div>
596</body>
597</html>